scrolled window: Don't leak timeout sources

We must only create a new source if there isn't one already,
otherwise we override the ID and leak the previous one.

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index f791303e7c9a29d32f190557beb675742ce2eb04..f49c832ba5e67026178168af25ad11200c51c4e7 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3760,14 +3760,12 @@ indicator_set_fade (Indicator *indicator,
 
   visible = indicator->current_pos != 0.0 || indicator->target_pos != 0.0;
 
-  if (visible)
+  if (visible && indicator->conceil_timer == 0)
     {
-if (indicator->conceil_timer != 0) g_print ("leaking conceil_timer!\n");
       indicator->conceil_timer = g_timeout_add (INDICATOR_FADE_OUT_TIME, maybe_hide_indicator, indicator);
       g_source_set_name_by_id (indicator->conceil_timer, "[gtk+] maybe_hide_indicator");
     }
-  if (!visible && gtk_widget_get_mapped (indicator->scrollbar) &&
-      indicator->conceil_timer != 0)
+  if (!visible && indicator->conceil_timer != 0)
     {
       g_source_remove (indicator->conceil_timer);
       indicator->conceil_timer = 0;